Another attempt
Further attempt to fix the production issue
Revert "Further attempt to fix the production issue"

This reverts commit b04e9f0d2ed92338492d6193b11329e4d2b3498f.