Is there enough value in that option for the complexity? This patch is pretty compact and does what's required, and falls back neatly to  the existing behavior.