This reverts commit 638f53cb. Reason for revert: Breaks Mac OS X build Change-Id: I5bf40c462f54c2caaa1c2635192503fa2311ec93