Revert 706e87a..3113b56

This rolls back to commit 706e87a7d42afe5ed506a278f510c3a41880062b.