I checked the patch in #2, it still applies cleanly. Even after the new featu...

I checked the patch in #2, it still applies cleanly. Even after the new features, the 8.x-1.x branch has only two @files, which this patch is removing.