As we've seen in recent patches, this has been a source of bugs, so let's be tolerant and deal with both. Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6