Case 2482 - Removed hacks from template.