Revert 61587a0..dce0107

This rolls back to commit 61587a0eff849762cb29c21f9c682e2d9e4613e4.