K 10
svn:author
V 6
royger
K 8
svn:date
V 27
2015-12-02T12:58:20.276178Z
K 7
svn:log
V 170
Revert MFC of r291023:

Due to the delta between HEAD and stable/10 event channel code, this fix is
not needed on stable/10 and was also causing build issues. Revert it.

END