undo

This reverts commit 40a82a8204e8de4ca3863731a9d266ef6ca42b70, reversing
changes made to 747b10b2050d3e51aa53f783c3488659f43fa591.