revert disabled bundle naming scaling code