Revert "Merge pull request #20619 from gmarty/Bug-1007948-no-multiple-calls"

This reverts commit 8ccac0744848bd3ceaa6aa1c972ae0eb1e9ddc1e, reversing
changes made to c2c92e7be95dd0b65ee44113e1d17592dd0e20c6.