Revert "Fix #1489"
Merge pull request #306 from thebuggenie/revert-304-master

Revert "Fix #1489"