Reverted auto-complete