Revert "Put back changes I made to file. Sorry. Messed up on merge."

This reverts commit fee7473cb7bbd8380b071b72265acfa0d3bec5d7.
Revert "Merge branch 'threaded'"

This reverts commit a8667e433beef37cb6cce5620f20839aabe46379, reversing
changes made to 55820349ca6adfd4dcc91893c0f3b8e721271aba.