Revert b02107a..c83f4df

This rolls back to commit b02107a3ad2c9d7e9bd3da164f51530e133ecdd4.