Bug 899923 - Backed out skip changeset 667ce2a60961 due to fix

--HG--
branch : mozilla-esr31
extra : transplant_source : %D4%A4A%93%B0%95%7DA%C6%B0%D1%1BHRkuF%AEO%29