I solved it this way because it seems the current state-of-the-art 89e98378 The problem was introduced in #11930. Close #11951 (a different solution).
