[Modify] Rollback to version that allow class-wide hooking