Issue #15767: back out 8a0ed9f63c6e, finishing the removal of
ModuleNotFoundError.
17 files changed