If I do this: $ git revert -n 6328536ff28ca26f2ad4e6f2c956c467acebda88 $ git revert -n 621b0fa8922ade0a8122b868177308e65e6d3595 Then xterm works fine and I still have direct rendering.