Revert "Fix various path inflexibilities and inconsistencies"

This reverts commit aba9e725d5bd4b4041e2c743d61303e914abb00e.

Change-Id: Iff3e98fcdad02a206fa2cd585db60df6e5417154