Mirroring John's fix with the new autocomplete scheme [13668771]