Another attempt to upgrade this module. Heh.