one more extract to yank

Change-Id: Ie98bdfe02fe4a2b03f73b7d6a09be7dd10ea8a9f