This was a more recent change than the branch that was just merged. Unreviewed, pushing to fix build.