Revert Fix pull request 2