Revert "Applied patches to new WMF 1.21wmf6 branch"