Rolling back changes made by mistake.

We can make this as separate commit. I'm trying to do minimal changes at single commit (although it's not going very well yet :)