Revert "Revert "another bad commit""

This reverts commit 0ff29ec17182a4dd12768405ffc204e3b93dd100.

Conflicts:
	IncrediblyCoolClassFile.java
Another bad commit