revert #911
Merge pull request #912 from seuros/master

revert #911