another try at #25056