Probably should re-enable these

Change-Id: Id5242ccf0974ca91cf5ea0e59c97ae715cb7b828