Make status updates work again

Change-Id: I44892322865e0cd505c9291824d88b02dce2d9eb