rebuild state
Revert "rebuild state"

This reverts commit cea880446d929caa277662c12abfa0aafbf8ec04.