Fix build from impacts of: https://www.pivotaltracker.com/story/show/55891634