This reverts commit 450f1d0f. Reason for revert: breaks poisoning configuration Bug: 36141117 Change-Id: I198c20ca1db6d7d7602aa5318616e2b149de8772