If that PR gets merged in, we won't have to have this hack around. 

So I'm cool with leaving it as-is and helping get it fixed upstream.