improve AbuseFilter code; no need to duplicate all that logic

Change-Id: I7164d477fa1b2c1672b0cee5d446f8af00ad7558