Revert 673725b..b898a17

This rolls back to commit 673725b90d132babf31407c66b00e1df7949df62.
Prod ready