Reverts back to 58ed76f..d75a9ed

This commit rolls this repository back to commit
58ed76ff31577649bcd4f1ffb2e3b8cc5bf80943 in order to prepare it for a
redo of commit d75a9ed65b0a8cf407cf260d0b52504c207b06b7 which I will
execute from a fork of the repository which that commit merged in.