Reversed templating changes which don't play well with PHP 5.3