This reverts commit ae29339ca1, which broke the darwin build. Change-Id: Ib33e2dab197532f04944cb12151002e9219b1bb5
ae29339ca1