Revert "autoclear spam cahnge"

This reverts commit f0db5ce526a219dbb1dd59ab3c1c02463e197f89.

Change-Id: I5dc5d95e86641b01e3b58df0f0cff3fbfc3ec0b2
Revert "autoclear mechanism = borked"

This reverts commit 436f91f8f1dcadcd2c0040f8a9e088f0a9b850a5.

Change-Id: I07745cafd78e383ff9642426e53ece9339651b3d