because I need to get the following patch to apply :-(

This reverts commit 2056f718.

Change-Id: I3b005725a826d0339a6d1bb8d211959cd03c7d6e
(cherry picked from commit 58a2d079400d6a6170b512b7fa387a7152849463)