Revert "Fix USB Mass Storage on some devices"

This reverts commit ac32acc33ee4a919096ad0167259eb264ea84c5d.