Backed out changeset 47c7cd88eee1 (bug 961047) for b2g scrolling failures