This reverts commit 0b874d53. Reason for revert: this might have caused performance regression Change-Id: Ic1927292fb13a3acfb6c6e8d069f689e426f5a8b BUG: 141561372