Bug #1929 - Relax sanitization rules