This reverts commit ec297f3e. Reason for revert: reverting a temporary revert Change-Id: Ie48bf3f8983b008f9eff9e0ce8fe283dded775ce