Revert "Bug 1111077 - Ensure frontend and state in sync"