* Back out r57890 in favor of a complete upcoming sync.