Revert "Applied patches to new WMF 1.20wmf2 branch"