I'm reverting previous commit. I'm not sure what happened, but there is a huge difference between what got committed, what came as a diff in e-mail and what should have been committed in the first place.