See #6437184175638, #6428471070939