Revert "Merge branch 'xyz-rotation' into 'master'"

This reverts merge request !52 (merged) because it gave some unexpected problems...