[PATCH] Remove last remnants of file extending
2 files changed