Revert "Yet another attempt at signature-build"