Classic Ship roll-backs

As per JJ's spreadsheet