Fix crappy backport by @BluePyth