revert 4.2.2 changes