revert commit 9f65919235b1c633e91d2146ec28f772053bdbef because it causes issues with IDEA and I don't Java7 yet