am 16283511: Remove unnecessary code

* commit '16283511f2bb94f00f8acee2069bbe30e100d1d6':
  Remove unnecessary code