REVERT FS-5555