That's pull #1721. And it does nix this file. So... I'll undo this part.