This reverts commit a006cf681b. It was squash-merged by accident; let's redo that without squashing.
a006cf681b