Add back last 2 reverts