Back-port our PATH fix