Unreviewed build fix after r150123