This reverts commit 70f8304d7ae4683734b435abeacaa069e33863c9.
Completely breaks compatibility with HTC Sense, but is needed for Android 2.3. References: 3362439a1d 03c08c01c6 3fa64c7f7f
3362439a1d
03c08c01c6
3fa64c7f7f