Revert "Updates for PROD"

This reverts commit 0df8d63dd9c055a55ed999cebb9c39d95c0d9bcd.