Back out c91b18cafc64 (bug 960749)
CLOSED TREE