Revert "Adjusting to latest nighly builds"

This reverts commit 27895fda7f8f909e5958a90abf54954800f88b45.