Revert "FS-5708 ... problems with build on this one

This reverts commit c21f65ac5519d26f12c969e26d8d3e009538e6df.