Revert 3432089..9ae83e9

This rolls back to commit 3432089cda23828e5f29207442ae3e2a852fe89b.