Fix #5157.

Fix, if my assessment is correct.