Revert "Merge pull request #22177 from steveck-chung/message-safe-lazyloader"

This reverts commit f33c6a11a2e03833e17e43d23be8cc05ea99445a.