Seems we really don't need this module anymore