Go back to normal external modules for the client code