revert to before merge with generic