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

* commit 'a7c8f538824ff710cb5dbb4fc8ba0df07178c878':
  Fix another poisoning problem.