Merge pull request #1867 from wpaulino/remove-signer-persistence