Revert shortened paths

Turns out I didn't like this

Reverts bb161f53c1b4edb215861b1ce72e896397605e9d and 70043793dc4d461ba3818cf7a8b6269a6c8ad08c.