This patch was a little aggressive and may get reverted (it caused immediate code breakage in downstream distros and projects). Changes like this typically ne

This patch was a little aggressive and may get reverted (it caused immediate code breakage in downstream distros and projects). Changes like this typically need a deprecation period (that said, to the extent the current feature didn't really work in the first place, we can immediately take it out).