This reverts commit 38123b86.

fontconfig was not building any more on many machines (most testnode machines). Revert
until investigation is done.