Rollback failed updates

cbugg: close bug-947
Closes #42