Revert "Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors" This reverts commit 6ebcfb63.
