Merge "Fix deprecated hooks not having a non-deprecated alternative"