The logic of 8fb5a686f40eadd2bdd9519fc65f23cc29ec3163 in binfilter
appears to hold for core as well

Change-Id: I73cd47586c4c83858f9eca92e019ad0108b514e0