Revert r191062; the build break was also fixed in a different (incompatible) way in r191060.