Restored original functionality

Reverted non-blocking code work in favor of something that compiles and
works again.  Will work on non-blocking implementation later.