Revert "Avoid FCS dirtyNotifier and instead rely on XS monitoring of files"

This reverts commit 359d3d4a76a24f42fea8956821b79c277c701e0e.