Back out my rev. 1.674. The better fix (rev. 1.637) is already in tree.
Back out my rev. 1.674. The better fix (rev. 1.637) is already in tree.

Approved by:	kan (mentor)

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