This would fix #12825, and pave the way for another suggestion to fix #8655. I'll link the proposed fix's issue here after I submit it.