Revert "backport display.template.php changes to pm template"

This reverts commit a8470790deeddc3b572a3a968967cee4a26b7e66.