Oops, we completely broke HA there.
Merge bug25749 (again)