Revert 0c86b14..d07d900

This rolls back to commit 0c86b14a81947eb1beaa107c7f8f80ef4b40dc9a.