Revert Commit

This is a revert commit from ryan's previous one. Basically a mirror of
what he had. I'll put the java files he changed back in.