In the case of #1934, I suggest to override file_create.