I lean toward that too. I think the best options are to either choose to classify this as a bug and "fix" it entirely in 2.14, or wait until 3.x to introduce it as a feature.