Revert "undo handler rename"

This reverts commit d913394c666423b6facf8e0706c723e730710360.