Fix fieldsets.

Shoudn't be modules.

Change-Id: I0499ac0b7b9a2cc7154d4f766e706a88e5318fa4