Back build fix from trunk.