This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support. Fix #2103