Revert 01a466e..37b1df7

This rolls back to commit 01a466e596a4f73e3f0b45c56f6ab7f34a3c4ddb.
Improvement on XYZ calculation...save point

YZ changes are small but X is large.  It might be wrong