Putting this back in to fix Windows build.

Change-Id: I98262000956f10dc3b3da069b6bc286fec314a45