Merge commit '492dbe17527e27ba712d185a1eac22ae149c67c0' into eclair-mr2-plus-aosp * commit '492dbe17527e27ba712d185a1eac22ae149c67c0': Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.