Revert "Revert to earlier working solution, add note"
Revert "Revert to earlier working solution, add note"

This reverts commit e0e9d44c59bb02e1e3b1ac551fcaf4329a4be96f.

jdereus/labman,jdereus/labman,jdereus/labman