Backed out changeset bf184a7a1d63 (bug 990608) for Android crashes.
CLOSED TREE