remove temporary workaround
Merge pull request #987 from andrerod/dev

remove temporary workaround