Backout changes from pretty print branch.