Reverting 26160443 to fix new bug (old bug no longer reproducible).

Bug: 27790638
Change-Id: I5d442d5162769c9fd022ab706cc0dd1a505c7fad
(cherry picked from commit e590d9139fa5156214f3b137db8afb90efe60a19)
1 file changed