Revert 9af24e9..c373460

This rolls back to commit 9af24e94ab0f91267c2278a9d272cba7b78918b2.