Revert "FMS 338"

This reverts commit a93492952ff156fe466a2a5d65ec035d17c906f0.