Revert 1ad5b6f..5ad5a9a

This rolls back to commit 1ad5b6f3ba750e0c6115296bc410b0907ad7d876.