Revert 9ffa2e2..e8e5c39

This rolls back to commit 9ffa2e2dde5e5dd43765eb786f4958dcc2faa284.