--- category: Bugfix authors: [youngcw] --- Goals: Undo change that broke some template parsing