Revert 95ab285..7b4a2e4

This rolls back to commit 95ab2857d9639f4f55cb5ae215cd04f272cac812.