Revert 88f85d7..bfe20fd

This rolls back to commit 88f85d76dd1adaffff5ebcc45e8f109e843b1851.