This reverts commit 74b7490a.

This change caused a regression in fugu usb formatting.

Bug: 35217931
Test: None
Change-Id: I50c73bde912a7c941e1d67d41bfab02042db88eb