Revert ad7fbc0..29eebec

This rolls back to commit ad7fbc0c2c527343186780912528b799f966d759.