bug 863452 - roll back a9b168b59bf1 until we get a decision.