Actually enabling

Change-Id: Iacbfdf2ce30f7da35a1a2f2787709088fe0b6a09