Revert changed to FlexForm