Revert 8c450ba..ee721d5

This rolls back to commit 8c450bab26b2ec674a0b599fd227cac1818c8b2e.