Back out #957240.
3 files changed