am 6f80f395: am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit '6f80f395b71cb641b77097e14a1906c7842c9ba6':
  Removing repetitive conditional; it simply does nothing except slowing down things.