Back out 2f60f94d4d3c and d06c2e71aca2 for cross-platform breakage.