Revert 3beda54..8c17aaf

This rolls back to commit 3beda54227ff6b39c5987f77ec060379042cedd6.