Change back to non-module imports