This reverts commit 8278e86918. Reason for revert: performance drop in Quicksilver app Change-Id: I2bdf42ad0a235a74e2bb4d38f86471e9affbd7a6
8278e86918