Revert previous commit.

Revert "Fix issue with duplicate sizes in file name." commit.
Something strange is going on. The commit partially fixed an issue
in one environment but seems to have broken most others.

For now we're just reverting back.