Revert some caf 1.33 stuff (broke spotify)

Change-Id: I081a426a092b1bcdeda7b57387116205842d436f