revert changings for g4 10.0 back