These commits were only meant to be in the main branch in the old gitweb
location. There presence here in the new location was an error.

This reverts commit 0630d8d2.
This reverts commit c4847124.