Cherry-picked 2f885de
Removed unprintable character