Revert 40d1623..40d7908

This rolls back to commit 40d162387087eed32a0209226796366aae35e7da.
included new template