Put back workaround for PYTHON-407 in case  pymongo was less than 2.4