revert r24407, its already packaged in the xorg feed