Fixes #5505: Rewrite techniques to use normal ordering on 2.6