revert supporting 2.10.x