Revert 234283d..bd641b7

This rolls back to commit 234283d5fe291cd94558497e2e4c645aecea45a2.