back out pull request #60 as it breaks mysql db queries