FS-8971 build fix. There are two different status variables with two different meanings. This splits them back apart.