Avoid computing self-similarity while calculating cosine average

Not completely sure about this fix. This is the way its being done now in Oryx 1.x, feedback Sean ??