revert to astropy/master which now has #725 incorporated