Reverting ycb upgrade