Cell state bug
Revert "Cell state bug"

This reverts commit 3c12ca263e204a282b6e91dcd2cc9ea7ba0c9320.
Cell state bug