Put back required args.
Revert "optimisation" which broke logic.