Revert 038f6d8..ce0edec

This rolls back to commit 038f6d8b64e9e66f11ee18f62a7ae4a70f3a9bb5.