ENGINE-1830, remove FS implementation to be sure