This reverts commit efcd5199d8. I rebased my patch series incorrectly. This patch contained unrelated parts from another patch, which made the overall build fail. Revert for now and reconsider.
efcd5199d8
749a9e20c