Refs #8594 Make the conversion optional.
Refs #8594 Update unit tests.