Drop obsolete workaround for ISPN-1583.