Revert "import of v5.19"

This reverts commit c86eaec5cddb0d02bb1bc0bdf3516c0803d0b703.