At least partially unnecessary, assuming some of the problems were
caused by the erroneous usage of Arrays.copyOfRange() in
Bootstrap.java.

Change-Id: I230b0ca6c17420f765a7d20aa377efc261186adb