By most part reverts a3d667002f. The header is undertested, used only in that single example, and has extra dependencies.
a3d667002f