CL has an unwanted 10-15% compile-time impact. This reverts commit 1de1e11a. Change-Id: I76b45aa95bbd24dd025d2ee6cf37d77fe17b8497