This is not logic I've written in this pass through.  I believe @dmitchell can consider this change.