It's clear it won't survive this change because I can't even test it, so who knows if its good enough to have in main.
