am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."

* commit '789c99a48e185a1e74af5fe9f837944bf4bf6b57':
  Switch init over to _PATH_DEFPATH.