Right, yeah :-1: on dropping 1.8.7 support, at least for now. That being said I also would prefer not to vendor yet another library - it introduces another (or two) upstreams to work with, more bugs to track, etc. If we just cherry-pick the change we need to fix the bug then we are basically forking Thor.

@indirect @sferik what do you guys think about this? Seems like we're stuck between a rock & a hard place to me :frowning: