Clean up. Now X11_TYPE=native is OK to work (by upstream).