Bug 982974 - Back out the previous fix-attempt for non-trivial issues.  r=orange, a=orange