Rolled code back to known working state.  Produces the results we
expect.