How to undo jailbreak on PW2 for trade-in to Amazon?

Okay, I did some reading on this. Just want to double check I've got the steps right.

Step 1: Factory reset.

Step 2: Manual firmware update.

My question is... the PW2 is already on the latest firmware. Will a manual "update" work regardless?