Revert previous commit, that was a bad idea.