Reverse AutoFormat.java

There was a conflict with AmnonOwed's version.