Yeah, I was having some trouble with this as well, but eventually I was able to make a new commit to remove the file, and then squash those two commits together. I opened a new PR: #2391