Back out #479898.
4 files changed