Revert r284516, which broke the build in a way I do not fully understand yet.  I'll redo this MFC after investigation.
Revert r284516, which broke the build in a way I do not fully
understand yet.  I'll redo this MFC after investigation.

Sponsored by:	The FreeBSD Foundation

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