Revert "Merging prod"

This reverts commit 5e71843a9fdfdb803be121bf3d5c9eeafa708030, reversing
changes made to 4d6a8157f0ecd421c96f08ce4bc5058a066e34aa.