Revert "Additional Eclipse whitespace cleanup"

This reverts commit 61fd7626a137abac2e096ba4dcf27e765230be73.