Update based on PR comment
- #9
- https://www.pivotaltracker.com/story/show/67918322
[Fixes #67918322]