Revert pull request 3