Restore code to the state that was intially posted online.  This reverts the past serveral commits that were the result of a bad merge and subsequent attempts to recover from it.