Revert 50dce99..d70e5dc

This rolls back to commit 50dce99c33138c4110c9f25197ec3db538c8edb6.