Revert "avoid expensive view hierarchy modification during cell configuration"

This reverts commit 3f7b5ae86fcd85fe822b02d769a8900b6760ef3c.