Undo of a0285a5fbed5dd477b75acd78f52904b48d97b5b, and fixed indentation again