Switched to use the class bundle, not the main bundle.