Re-added the changes for Fish.java committed in the last commit.