Fix merge conflict from 4299.
Merge pull request #49 from rseanhall/feat4299

Fix merge conflict from 4299