undo pull request #287