This repository was archived by the owner on Mar 25, 2018. It is now read-only.

Revert merges of r12531 and r12562 from 3.12 branch, going back to 3.…