We should validate functionally this change with PMs before putting it in production. Reverting for now.