This reverts commit 1490434f.

Several people have reported regressions with this patch on kabini.