This reverts commit e5bc6976. Reason for revert: This is no longer required Change-Id: I80d4a866916a77032e205257d6f920b928fb876f