Revert "updating on each load"

This reverts commit 7c3cf1989d9404728b9f6eb5c5081c208e60d98b.