Revert "Fix some minor refresh issues."

This reverts commit 3062738cf71c7bdf97c92d3a33003ac99d6ac050.