I ended up disabling the check - it's more trouble than it's worth.