Revert 71c4e2a..8896ce8

This rolls back to commit 71c4e2a51c1b0fb88eda0f60602b65d9f16cdf9b.