Revert 32086c0..9751da4

This rolls back to commit 32086c0769bc97de09d90a13076bb8d1ea1886eb.