This reverts commit 192e3aa6. Reason for revert: broke mac tests Change-Id: I3f4c679e11d9361dbc2daaf6c89282259b225d61