Removed template path overrides to prevent breaking default templating behaviour.
Fix cmerge conflict.