ENG-5502: Hopefully fix IPC/Valgrind issue.