Revert part of the r236935 for now, until I figure out why it doesn't work properly.
Revert part of the r236935 for now, until I figure out why it doesn't
work properly.

Reported by:	davidxu

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