Reverted. Last two commits weren't a good idea.