This reverts commit ed4a7a70. Missed a darwin disable. Change-Id: Ifa052cb6b6686d1e6c408f64dfd9b82b362048c0