am 662b598c: Stripping out code path that we have no intention of using

* commit '662b598c86a1772d95303ef9c921d4bbe342387b':
  Stripping out code path that we have no intention of using