Crap I just released a PR that did pretty much the same thing as you here :/ Well.. some of the other stuff in this PR might still be applicable.