diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index a9f45767a6..0853b41872 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -417,13 +417,9 @@ void DomainBaker::enumerateEntities() {
                     addMaterialBaker(MATERIAL_URL_KEY, materialURL, true, *it);
                 }
             }
-            // FIXME: Disabled for now because relative texture URLs are not supported for embedded materials in material entities
-            //        We need to make texture URLs absolute in this particular case only, keeping in mind that FSTBaker also uses embedded materials
-            /*
             if (entity.contains(MATERIAL_DATA_KEY)) {
                 addMaterialBaker(MATERIAL_DATA_KEY, entity[MATERIAL_DATA_KEY].toString(), false, *it, _destinationPath);
             }
-            */
         }
     }
 
@@ -449,7 +445,7 @@ void DomainBaker::handleFinishedModelBaker() {
 
             // enumerate the QJsonRef values for the URL of this model from our multi hash of
             // entity objects needing a URL re-write
-            for (auto propertyEntityPair : _entitiesNeedingRewrite.values(baker->getModelURL())) {
+            for (auto propertyEntityPair : _entitiesNeedingRewrite.values(baker->getOriginalInputModelURL())) {
                 QString property = propertyEntityPair.first;
                 // convert the entity QJsonValueRef to a QJsonObject so we can modify its URL
                 auto entity = propertyEntityPair.second.toObject();
@@ -489,10 +485,10 @@ void DomainBaker::handleFinishedModelBaker() {
         }
 
         // remove the baked URL from the multi hash of entities needing a re-write
-        _entitiesNeedingRewrite.remove(baker->getModelURL());
+        _entitiesNeedingRewrite.remove(baker->getOriginalInputModelURL());
 
         // drop our shared pointer to this baker so that it gets cleaned up
-        _modelBakers.remove(baker->getModelURL());
+        _modelBakers.remove(baker->getOriginalInputModelURL());
 
         // emit progress to tell listeners how many models we have baked
         emit bakeProgress(++_completedSubBakes, _totalNumberOfSubBakes);