Saving this now before Eclipse clobbers this again.