This works since a recent commit, which wasn't designed to solve this issue, as we weren't aware of it.