fs: bulk revert some patches