am 43bbbf8a: Merge "Remove more of the pathmap."

* commit '43bbbf8a15cfc03ce99d0b6a49992b25cf51fc39':
  Remove more of the pathmap.