adjusting as per the latest official version in the nighly builds