(Bug 48528) Re-applying patch to track weird bug in Zero extension. Need more logging data.

This reverts commit 62b85ffd011d32b79c3e1fc26432d1327039a53a

Change-Id: Ifa24a8df8b5afd186506d8001bb8c02dcc2b496d
Merge "(Bug 48528) Re-applying patch to track weird bug in Zero extension. Need more logging data." into wmf/1.22wmf3