Revert 58037f5..cf08b70

This rolls back to commit 58037f51641e7a794b3511b5d5c6ab127d692b1b.