Reverted the breaking change where we throw if a callback with fewer arguments is encountered

#2203
Made changes as per code review feedback

#2209