DUMMY PR, IGNORE ME

Rebasing #1758 and #1759 on master to apply and test internally. This PR will go away and should not be merged.
(This logic is wrong but is right in #1908/#1758/#1759 now.)