Revert "Merge branch 'tiz' into devel"

This reverts commit 9500bbd1a2d3732f8729fc016b7da0edeb3f4817, reversing
changes made to 2bdeb2acb190b685e9e82e8ea4050d28afe7b3a5.