Reverting my earlier change to make FOP compile with Batik 1.6 again. I'm investigating this problem further.