Removing support for pre 4.0