Remove the conditional signing trick