Cleanup PR #268
Merge pull request #281 from ehashman/issue987

Cleanup PR #268