Fix bad merge from 04c9820694ac07bb88d3dda32bf35a063c3c61a4

Didn't sync out correctly.