Rolled back to 9b7d10a2ff132f6f367d1a90251b67af6a5b5918 (Fixing eclipse imports) as it was much smoother.