Phew! Switched the client to RequireJS!!