Actually fixes #5100