Patched from internal experiments.