Revert setting of fields to public scope