Revert "++experimental"

This reverts commit ca640500cf4e7969a05619fb9acdb94b3744c70c.
Keep original behavior for ice10922