increases compile time too much, I will run this by hand periodically

Change-Id: I118567ef294847ff609d4de771d998ce3b57161b