Undo some aggressive refactoring done by Eclipse :(.