revert back to old format, since I broke things