This fixes support for ":" in filenames.
BUG: 376365
Pushed in b785b9c (stupid arc land merged two commits)