Reverting Java7 stuff, sorry for that