This finally concludes work on #880, left on -devel for a while
longer to double-check with the requesters.