Uncomment the base form widgets as we do seem to rely on them