Revert 0e361e8..f32bf24

This rolls back to commit 0e361e8c0b7ed3a661e7a8d7ba5a9166e63a61b0.