Okay. Well you changed it from having 8-space indents to having a mixture of 8-space indents and 4-space indents. I'm okay with having a code policy of only 4-space indents, but in that case you need to change it the rest of the way, and then we need to change the rest of the codebase and implement a checkstyle policy. Otherwise we're going to be having stuff like this happen all the time. Personally I'd prefer to avoid going to that extreme, but there's no middle ground here. Either we insist on an indentation policy or we don't.