oops: Partially revert 7042e6c8fa

Merge conflict caused the inclusion of the template to be lost