Work on 2.9.x compatability.