I know how to wrap it up and get it upstream, but the only reason I have the energy left to do this is rmk already dealt with the bulk of the pain, and I happen to have more experience than him with the issue that was the final straw for his attempt.
It shouldn't be this way.
@marcan :/ Sorry to hear you're still having a terrible time upstreaming this.