Follow-up to Issue #2151105 : Helps if I commit the template file doesn't it? ;)