Bug 966241, revert some of bug 941051 and just use Intersect instead of IntersectRect, r=neil