#317 reversing PR #318, as it incorrectly went to the master branch

I'll re-apply this change to dev