Revert e07674e..4cef118

This rolls back to commit e07674e259ebd3eaaf5ac97279f42ff6a37e886e.