Merge "Revert the 11.xml part of bug 3438513"