Shell roll-back