Revert "Update the first two arguments"

This reverts commit 2a207850a045874a51476e993437b69df3bb1efb.
Revert "Revert "Update the first two arguments""

This reverts commit 9051d788b9cb987fa58de986f254c804d102417b.
Revert 9889683..bf27b69

This rolls back to commit 9889683d27b140c6151936cd3641ace65aced917.
Revert 3c447cd..e792a0d

This rolls back to commit 3c447cd2541e085c8dc616a19de8ef93abbc4fd4.