Reverting form fields instantiation changes since this is currently affecting admin reporter management.