[BUGFIX] Revert "Improve performance of Fluid TemplatePaths"