Revert "Merge pull request #1154 from jonathanong/graceful-fs"

This reverts commit 41ef1a9828ec4247ed7fbc4f7aa2764cb1904f28, reversing
changes made to fad92887921ee0fb3f27e64f43f25b7fc183f176.