More aggressive IPC fix.
Merge pull request #9419 from cachedout/unit-tests

More aggressive IPC fix.