Revert ef4afd0..58382d1

This rolls back to commit ef4afd0d7d454b21e52f16b4153598af6cb02423.
xft patch edited

This reverts commit 1c926c30706eba5695ca2f94bc3cb6a0a992faaf.