Update to use Spoon-Knife's 1st change on parent project.