Revert "Workaround to reduce the number of perceived cell changes.  Many need to look at attaching some of the invariant data to Cellstore rather than re-calculating them needlessly."

This reverts commit c1d04603ced0f637239aa6f032a6a45edc174c62.