revering the fix for forms, which added a new bug