Fix: remove obsolete workaround (see 22.2-3.1)