A hack to try and get building new versions working