Revert "Make the S3 fix less specific."

This does not do it for Android 4.3 and probably breaks the old S3s.

This reverts commit 37f6dca1b6523688aacb4b55d7514de5d902a658.