Reverted version to simplify pull request.