Partial revert of r1444573 to restore intermediate-format-ng.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1444631 13f79535-47bb-0310-9956-ffa450edef68