Backout r182652 - as it breaks the build (due to `IN6_IS_SCOPE_EMBED'). [My apologies for backing this out, but we're up against a code freeze]
Backout r182652 - as it breaks the build (due to `IN6_IS_SCOPE_EMBED').
[My apologies for backing this out, but we're up against a code freeze]

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