[PATCH master] Remove resetResolver function, we don't need it anymore (#868695)