Revert "production workaround"

This reverts commit 5b5a5c744f2a900172202785658771160364ca09.