This is in GCE to deal with a GCE specific issue; there's no reason to believe we need the same logic on AWS.