Revert 586be00..2cf8e94

This rolls back to commit 586be00f6791c1662208961479cb79a19180da51.