Reverted because we need those fields for testing