Bring back bundle and migrate for production only