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

This reverts commit f5080f3742a57233436b52de959ddb317082f31e.