Should https://github.com/astropy/astropy/pull/2094 go here?