Revert last change.
Merge branch 'bubble-tree' into drawing-octave