This change as well as the one below were just band-aids to get things to work without the bundle-aware class loader, we should revert this part if possible.