Revert to before Z-Curve ordering as the implementation was flawed