Implement spoke workaround
Merge pull request #9 from zendesk/pelletier/spoke

Implement spoke workaround