Revert a few changes that eclipse did because eclipse likes to think
	it knows better than me.