Too much from the pull request. Removed.