Roll back some changes (2)