Any reason why you didn't include https://gist.github.com/halorgium/7e0ed0c96fc9491661fa as part of this change?