Roll back a couple of changes.