This reverts commit 45715b2a. Reason for revert: Darwin sucks Change-Id: I004dd7fa5e14a43ffe04ace2f5a06341df61b8cd