Revert 50811b4..7f23c07

This rolls back to commit 50811b469f153f707ddd597d4cefd27779a7fbee.