Per https://github.com/astropy/astropy/pull/2957/files#r17755626 these are really two separate comments [skip-ci]