Revert 29733a7..9ea3fa7

This rolls back to commit 29733a721cb9923fd5c2044d0618051338c4a754.