Revert r253247.  This change should be improved based on a lesson learnt from r233646 first.
Revert r253247.  This change should be improved based on a lesson learnt
from r233646 first.

Pointed out by:	jmallett

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