This will make the latest upstream merge easier. This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.