Revert "Adjusting to the latest nightly builds"

This reverts commit a81d0dfe9d7b16302505a5e6bde633f7ff6b5621.