Reverts pull request #69