Slight update. See here: https://github.com/astropy/astropy-helpers/pull/55#discussion_r14938590