Revert ""

This reverts commit 6ac1579235508dc143ac8006fe852d42ff96eebd.
Release 1007 - Offers