Bug 810726: Backout 34d30fa24371 for infinite loop problems. [r=mats][a=lsblakk]