Partial revert of previous commit as some of the changes were not newbie-friendly.
Partial revert of previous commit as some of the changes were not
newbie-friendly.

Requested by:	jhb, gcooper
Approved by:	cperciva (implicit)
MFC after:	3 days
X-MFC-With:	r235209

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