Revert 343b3a6..b0dbf4c

This rolls back to commit 343b3a65e0c8f0ed8db422c3f43d700742c2e209.