[bug 979641] Fix happy field

We had an explicit hidden happy field and an implicit one and the two of
them fought and made everything sad. This fixes that.

Quick r?