Reverting back from 4.0