Revert "Implement new IPV6 filter logic"

This partially reverts commit 891965f79cf914bf0cc632077ddc15669fafed00.

Change-Id: Ie9078a829d6027f8a82d5761bccf62f07151504d