Attempt at fixing nightly builds