Breaking change: moving to keepOriginalWord approach