Revert r306148 to fix build
Requested by: jpaetzel Reported by: Larry Rosenman <ler at lerctr.org>, Jenkins