am 7e4a0047: Merge change I97b30e2f into eclair

Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-mr2

* commit '7e4a004799eae347f1be227ecba6850d1b386bd2':
  Revert jparks code from IPCThreadState.