Why are we still building this!  Get oudda here!

Change-Id: I01f32f049d81a3db6151966b1578cc076c66667b