Revert "Fix USB Mass Storage on some devices"

This reverts commit 9eb1cd47520498e181a2d9fb2f3b464ae5327bd8.

Change-Id: I66d3d6bb5633e6df3e8f7db250fc6d62817a5489