Revert "Merge branch 'master' into fancy-lightcurve-viewer"

This reverts commit 03907b5486db3d33d994545520aafd792cfc193a, reversing
changes made to 0a976be28beecf158ad7d4a5d53202f5a217b73a.