Drop the obsolete workaround