See #6428471070939, #6437184175638