This reverts commit 471f8cec. Reason for revert: breaking tests Fixes: 175508982 Change-Id: Ic66ac892d857e53cd613e769f837782be125db67