[5.x] Revert select modifier (#10218)

[5.x] Revert select modifier (#10218) #22232