Merge pull request #20641 from cpuguy83/revert_inotify_changes

Revert fsnotify changes