revert to previous implementation
Merge pull request #267 from rjc123/master

revert to previous implementation