This reverts commit f18429372f12b571aef539855c4dbef23a96f494. Bitten by -Werror,-Wdeprecated-copy on a buildbot, alas!