Now also works with more than one '+' in the signature
Revert "Now also works with more than one '+' in the signature"

This reverts commit b0e765a1f150df59620ca3ebca36e545ff4f7d3b.
Now also works with more than one '+' in the signature