roll back some changes