this actually doesn't fail any more, but I've cloned this from the other PR