Revert 3e27854..06af353

This rolls back to commit 3e27854ae3f800d8fa88c8b1b3b90e6ee128de8b.