Revert "Merge branch 'Deitronix-master'"

This reverts commit 6f5097498b2dc4c176674e2209af8fe8f9224cf9, reversing
changes made to 3042d5e561ceb3a77d52f35c407aa86bf47a1d9f.