TEMP COMMIT FOR CODE DIFF ONLY.

This puts code back in original sequence (not revised more sensible
sequence) to assist with code diff review.