Revert "Play around with loading messaging"

This reverts commit 0b9be60aabdaf300865cc4cb251bf3d3623fe190.