Accidental but correct merge of rollback branch to master