Failed to fix a bug, but in doing so I found lots of bug tracker discussions rejecting patches to upstream introducing APIs that would have at least given me other workarounds to try. I was planning on getting rid of that dependency for 2.0 anyway so now I have another reason to do that. The down side: replacing this is going to be a ton of work.