This protected against the performance regression that was addressed in abec307409. Change-Id: Ie5f7c2c713a10eec19bc19e0ba709f36599fb291
abec307409