revert 3.0 rc 1 changes