back out changes in module loading -- this is apparently causing issues with menu. This should be fixed