Reverting back to requiring 4.0.x