Fix kitchen-sink build

Resolves: https://www.pivotaltracker.com/story/show/61874624