Also, if talking about risks, the proposed approach of unlinking previously linked stuff that might propagate who knows where, doesn't strike me as particularly risk-free either. Maybe, if we're willing to take risks, we could take them for a cleaner solution. Or, alternatively, how about delaying this fix until 2.11.1, where it could be dealt with properly without endangering 2.11.0-final?