The fix for #12584 also fixed the problem in #12411. Let's add a test to ensure
that it stays fixed.

(cherry picked from commit 184d7cb8)