Revert "fix #306"
Merge pull request #408 from kmc/revert-404-fix-306

Revert "fix #306"