Temporarily back out changeset 2257 as it breaks the build, and is thus in the way of preparing the 1.8.0 release.
Changed paths: