Attempt to make it more like our build