This reverts commit 87a20868 as it has problems with scalable vectors and use-list orders. Test to follow.