[finished #79019708] again! (Needed to start and point the story first.)

Change-Id: 406b10966c