fixes noConflict mode in old template for 1a4a2d0d09 and 253fd6ae09