Merge pull request #2804 from rubenk/remove-poison