Revert "Adjusting to latest nighly builds"

This reverts commit bcd8f4bf3cd07867873bdb4ab4d9d7f342a14954.