Over-sanitized. Closes #2933.