The previous behavior only adjusted sys.path during module import. This
caused problems when there were delayed imports.
--HG--
extra : rebase_source : ca331f6da5f4e69ae74e8e831a41b12405fdd7fc
extra : amend_source : e0bd180a6fe5b5f64b2b8860f85887a9fd5b848e