Another attempt to try fix nightly builds