Revert PR #621
Merge pull request #633 from dionyziz/revert_621

Revert PR #621