merging
- [ ] closes #xxxx
- [ ] tests added / passed
- [ ] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [ ] whatsnew entry

This looks to be an errant PR so closing as such but let me know if I am overlooking anything Thanks, yes, it's errant. Sorry, I think my lack of prowess is causing a lot of extra headaches for everyone. 