Fix restore nonce. Closes #2138.