No longer necessary with how calls are handled meanwhile, and thus avoids a bunch of duplicated code.