Merge "Revert "Override default assistant""