Revert 609e639..baadafc

This rolls back to commit 609e639d86739eb8ce29a14ce39f119e45ce3973.