Revert to Pull Request #1 and #2