This reverts commit 772a0eb68a, reversing changes made to 0bb178bbb2. This needs a rebase against master branch - it has build-breaking merge conflicts. I also added a "changes requested" review on the original pull request.
772a0eb68a
0bb178bbb2