I think astropy/astropy#2310 is probably fixed by this.