Port over fix for https://github.com/validator/validator.github.io/issues/5