Hotfix/#176 revert commits

Reverted commits of #176