Rolled back some changes that were supposed to be dev only