revert 7.0 change