Revert 28c4f0b..70c1724

This rolls back to commit 28c4f0b67203b553b47e3e5889c91e2e0005f217.