Revert 0b3af03..7c941b4

This rolls back to commit 0b3af0318583020750bbca708c57cc43f2c3505d.