Revert r32475: it is causing a compile fail.

Ralph: can you fix / submit a custom patch?

Refs #4845
Fixes #4845

Custom patch version of r32460 - need to use v1.8 flags instead of v1.9 bitmaps