Revert 961e091..95e6337

This rolls back to commit 961e0913679eb02855bcb42ef288de06939182a0.