Rolling back  #1462