Merge "Revert "Revert "Make sure that const-class linkage is preserved."""