Revert "Merge https://github.com/massemanet/inotify"
to merge later in an acceptable way

This reverts commit aa4edc9e96f96fbc9b37b9aa9d26424d17bd605a, reversing
changes made to a3fd630b41e8df3d4ea4987eef2d001289f2e64a.
Merge branch 'tidy'