Removing my additions to receiving messages

I added this code as a hack to work around a reconnection issue.  Now my
hack is causing a bad bug.  Guess it's time for this hack to go away.
We'll see if the reconnection bug comes back without my hack. :)