Comment # 10 on bug 58659 from Bryan Quigley

Reverting commit d025e9e2b890db679f1246037bf65bd4be512627 does indeed fix the
Big Picture issue.  Will test the patch now..