Getting rid of old template hack.