Revert "First java 8 fixes"

This reverts commit 614952ac170d6b32e62a9fd22345bfb36a163321.