Fixes #5507: Rewrite techniques to use normal ordering on 2.10

One commit for new versions, one commit for reordering