Fix autofill that was broken by 59f25d6140225fcd1289d67c34a1c76e862cf9f6