Revert "Bug 1111077 - Ensure frontend and state in sync"
Merge pull request #5551 from jwhonce/revert-5546-bug/1111077

Merged by openshift-bot