Revert b7342db..461a054

This rolls back to commit b7342db7fd7808d7d9050bae50ca04131fee1ae0.