Revert 682b884..3b55c02

This rolls back to commit 682b8842554831b4668baf0f6ddbb1525edfd4db.