Restore State before Last Update

Restore to a state before last update as the implementation is buggy on
Mobile.