Revert "Merge branch 'tube_calibration_1' into develop re #6344"

This reverts commit a00da7c053253ff5a9f050caa4ef8b667f16fc13, reversing
changes made to 804e126ebd86403441793ec00a49c6a51b8912cc.