Revert reverts

David Verelstrequested to merge
revert-reverts into master

Not all commits have been recovered from the previous revert. Revert the revert commits.

Merge request reports