Revert "Merge branch 'master' into add-astrometry-net"

This reverts commit 8472c957882cc3fb3f48da03e1b314e741d4c2b2, reversing
changes made to 83efb6e7a06c58129f7d26dea192c149126d535d.