Closing file descriptors and backed out the change for Linux.
Authored by: tswift 2018-04-20
Parent: [r9258]
Child: [r9260]
