revert fix for #1043
Merge pull request #1045 from dennishendriksen/master

Revert fix for #1043