[mq]: Bug 1053169 - Backed out skip changeset 9aa710530a34 due to fix