Revert 2ec8ce7..d192c38

This rolls back to commit 2ec8ce747be6b4c2e983fa3dc8a4da31fea1b4a3.