This change obsoleted the import of prefer_xmodules