Revert "template_dependency module wasn't fully falling back to defaults if override missing"

This reverts commit 27665cfcf434d0223a1cd9b843c2234d4251a6c3.