Log Message:
-----------
Revert "[1.5.x] Fixed #21335 -- Use importlib from python3 when using python3"
This reverts commit 1ef737416ab56a6becee36876769909a37541465.
This would require changing some import_module calls (relative
syntax, see ec0a3f50852), too much for a stable release.