Remove obsolete workaround for ISPN-3048