Fixes CRM-13979 by moving the status update out of the BAO layer.