Remove repeated method.
Merge remote-tracking branch 'upstream/master'
See if build doesnt fail