Back to Standard

... remove local modification (which where required to compile without
USB)