remove R13-ism imported from upstream