Partially reverts #13657
Partially reverts #13657
larrybradley/astropy,astropy/astropy,pllim/astropy,mhvk/astropy,lpsinger/astropy,larrybradley/astropy,mhvk/astropy,larrybradley/astropy,pllim/astropy,astropy/astropy,pllim/astropy,lpsinger/astropy,lpsinger/astropy,lpsinger/astropy,mhvk/astropy,lpsinger/astropy,pllim/astropy,astropy/astropy,larrybradley/astropy,astropy/astropy,mhvk/astropy,larrybradley/astropy,astropy/astropy,pllim/astropy,mhvk/astropy