Revert "lazier computed properties – don't bother watching"

This commit is something we want long term, but at the moment it has some
unintended side effects that we need to fix first.

This reverts commit cc4af51d94336e7764e0ebfc88a0f87d4e627278.