GitLab

This reverts commit 7edd07c9.
We need to revert here as this change is not in Gingerbread
or later branches.

Change-Id: I1b0d68655e3a91647f455cbc43f421db39f9aa55