Revert "production workaround"

This reverts commit 22eee69bffcd2b96b4317a25bfbc5ffd97690fe4.