Revert use of base in custom_template