Hate Autofill in Safari 5.1

Autofill worked perfectly in v5. You type a few letters and it suggests the various data you've typed into fields of that name before. Now you type a letter, and your only option is add info from the Address Book. Which information? I have 5 email addresses... so I have to type the whole address out -- which is not Autofill.

Does anyone know a way to get it to behave in the previous way?

Thanks very much.