Update inventory upload to properly test the group membership of possible matches
Temporarily revert Tom's changes