This reverts commit 6271f5cbe5. The original commit 15094eb03a was reverted because it caused a problem during bootstrap. That problem is fixed in a subsequent commit.
6271f5cbe5
15094eb03a
linkViaSignatures