Revert 230b769..6091ccc

This rolls back to commit 230b769a3d1a36b30f3bfc9dce1a6c9ffb8c1f46.