Use simpler directory path 

Opened against integration branch as asked in #2273