This reverts commit 212dd9c2.
It's causing test failures in gdiplus. This will need to be redone
properly after 1.8.