Revert java7 catch blocks, they don't compile with our settings.