Back out 5c6e4e0, we still need to set the flag, that's what the lower
layers check.