Revert "Applied patches to new WMF 1.21wmf11 branch"

This reverts commit 855d049c75fe303a7a0fcb06dba60170437a694d.

Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875