Fixed commit so that non-blocking communication is completely stubbed.