This is still not perfect, but at least we now don't do the opposite of
what was asked.

Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11