Merge change I97b30e2f into eclair

* changes:
  Revert jparks code from IPCThreadState.