In 2c4c1b9, I missed the fact that we still need these, so that slashes in names aren't interpreted as a path separator. Change-Id: I2df0745669c4673497a506a99e754c63dcba045e
2c4c1b9