Revert "Fixed conflict with X's Font"

This reverts commit d653e26f3e4ec7d3582ff1e26e0e6fe53fa0dbc6.