I guess this is at the heart of the upgrade/fix, but it needs a lot more comments given how counter-intuitive it is!  Is there not a better way to handle this than simply flipping the senses?