WARNING: THIS COMMIT MAY BREAK CHARACTER SETS!