Revert 6c56c91..bd60b50

This rolls back to commit 6c56c918cfedc0e6e22968805e4c1c26cd4b5b00.