Revert template errors introduced in commit 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11
Merge branch 'fix_bad_merge'