Revert some stuff via 146cf26 which accidentally snuck into #1999 by mistake#2043

peternewman merged 7 commits intoOpenLightingProject:masterOpenLightingProject/ola:masterfrom

peternewman:nortle-ftdipeternewman/ola:nortle-ftdiCopy head branch name to clipboard