Backed out changeset 65f8a8468c6a / bug 939391 due to not being needed on builds newer than 25.