2.

I'd rather they just fix the whole stupid, borked system, but if I have to pick between 1 & 2, it's no contest.