Back out patch for #1159051, which caused backwards compatibility problems.
5 files changed