Removed 2 hooks from template that should have remained in 3.x.