First attempt here: https://github.com/hibernate/hibernate-validator/pull/904
But proper fix is here: https://github.com/hibernate/hibernate-validator/pull/906