Revert "Sync up with baptiste's latest version which also fixes the bad paths."

This reverts commit 192354c626467071c5daae871c2a1c16acaebb59.