Reverting changes from DMAAP-775