Revert "Adjusting to the latest nightly builds"

This reverts commit 7d827edb117e2ad94e342a403ad3aed878463e3f.