Remove a fragile ordering dependency.