Revert 09dc1e1..bf233c4

This rolls back to commit 09dc1e1100f36a0ff7e63d8491294a53ceac2061.