Replaced degree code with char, joined import line.

Cherrypicked from PLi.