I haven't tested these changes on device yet. Please only merge you test it or I follow up later to say its tested. For https://github.com/adafruit/circuitpython/issues/475
Thanks @caternuson!