Ian is correct. I can still see this bug even with this change. This reverts commit 3a083150. Change-Id: I780f2de926f1ff7576adc679c56a6cf491dad127