FS-5757 revert