Revert "Wei's updated odometer"

This reverts commit 4a39a69c44a3f6c815c8181d968e2c3ed0e4f3ff.