am 8446ed41: Merge "Fix another poisoning problem."

* commit '8446ed412d3a4ca2c70737d6f40c4129b0ee8ab1':
  Fix another poisoning problem.