This fixes lp:1010899, which showed a condition where we could end up with a bad...