Could do with a comment saying why we're doing this. But will merge now, as want it fixed in jenkins build.