Getting rid of the "unstable" component/machine concept.
Authored by: debug 2019-06-10
Parent: [r6234]
Child: [r6236]