revert revert
FS-6287 --resolve
force sofia rebuild