Revert "Hotfix 1237"
Merge pull request #2 from Castrovalva/revert-1-master

Revert "Hotfix 1237"