I'd have to undertake to reflect on whether an adjustment to regulation 5907 would achieve the outcome you've described. It's likely the case, but it's about 35 pages long. I don't know whether surgically they could fix it quite as you've described, but I'd certainly take it that this is a likely outcome.
On May 8th, 2007. See this statement in context.