Undo previous change and remove OpenJDK7