am 5943bf87: Also check legacy path

* commit '5943bf87fe6511fa688cb29ccef87ace5ccda522':
  Also check legacy path