Reverse pull request #166