This flag was never doing much, and is only raising
the wrong expectations. Remove it.

Fixes: #5893