This flag was deprecated in a previous cycle. The flag and any uses of
it can now be removed.
There is still a bit of simplification that can now be done around this
feature, but this is kept separate to avoid confusing matters.
Change-Id: I8ae8507a089df4d0a32be5fbc615e2166f44516e