After some more digging, looks like this is a duplicate of #17976. Could someone mark it as such?