Reverted xft patch
Better xft patch