Temporary workaround for SI-7354

Cannot use value classes :(