Back out of d8d79ba17527 (bug 828201) as it caused a significant memory regression on Android. r=me