Merge "Proper fix after -Bsymbolic change."