Fugu is still unhappy Bug: 28406866 This reverts commit 340f486a. Change-Id: I45fc77f924d991669d27b99c1458b2def8692664