This reverts commit 40041c9a. Needs to be generalized to all platforms. Bug: 26327751 Change-Id: Iae8f1c8846d120d8e3e99b6eb87f3760bf793ec5