Add FD stuff
Merge branch 'File-descriptors'
Revert "Add FD stuff"

This reverts commit a7cc0db7addd4acd0f6aa264acf0b49ae1acc8a9.
Add FD stuff back