Revert gratuitous change in rev. 1.123 which broke building world as non-root.
Revert gratuitous change in rev. 1.123 which broke building world
as non-root.

Breakage caused by: green

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