Fix build breakage. This reverts commit 26b4f598c8. Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
26b4f598c8