Roll back some of these changes