This reverts commit 2e9bccd4a2.
2e9bccd4a2
Changes per instructions here: https://github.com/adafruit/circuitpython/issues/979 ...builds locally. Let's see what Travis thinks.