Fix self merge
Merge pull request #600 from twitter/merge-fix

Fix self merge