Revert "Merge branch 'undo'"

This reverts commit 756e7646f3aa7f71347e7a80a8d595d90776289b, reversing
changes made to bcc8ebab522b9fd81fa5093b54a52cee071ae49a.

reverted merge