Reverting broken template changes from a6645f92bb139514f057ea86e4d6ca1490dffec0