Back out r250768 until I can further investigate why it might
be causing problems with the BeagleBone Black boot.