Revert last commit, does not work on my S3.