Supersedes #31651

Comment From: snicoll

HTMLUnit needs to catch up, I've created https://github.com/HtmlUnit/htmlunit/issues/490