Bug 999352 - backout dcaf06de49f5 to fix an apz related regression r=me a=1.3t+