am b76ce125: Merge "Remove a useless function"

* commit 'b76ce1251ee78067ebdc349ea94ea145d87488c4':
  Remove a useless function