CB-7674 put super.init() back into the template