revert the change to not include whitespace in templates