Revert 2abf3f0..b0d9a90

This rolls back to commit 2abf3f055ee42464e9bbcabb0d94247fd99416c0.