While 'make universe' passed this didn't work with clang.
While 'make universe' passed this didn't work with clang.

This reverts r242120

Submitted by:	Jan Beich
Approved by: cperciva (implicit)

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase