Revert 83ef829..bce071a

This rolls back to commit 83ef829e56b0fcd80147e2cd2e81ef7b90a26c21.