Just wanted to add ... I ran into this same issue and the accepted answer was exactly what I needed, but it took me ages to realize it because there seems to be a fair delay between when you upload the policy and when it takes effect.

I kept thinking something I'd done had fixed this, only to have it break again 10 minutes later. Turns out I was jumping the gun and reverting the working fix to try other things before it had time to actually kick in.