Merge #12947 workaround from 3.3