Closes PR 6579 --- which was actually about the now next-to-last argument, but close enough original commit: d5fdee7e0691f36f2d102aea81f74f579d28fe03
original commit: e504acb72622f4668a50770476fc7545ef9450b0