Restore r39518 with fix. No need to be snarky :/