bug 846220 - back out 364f2074b7df0e9c1442a269d16a57331dacab0d