Undoing changes seems to be very inconsistent in whether it works or not, and which changes it undoes. This will probably require a lot of testing...

Closing this for now, as I think this has been taken care of. Might need to reopen it later, though.