Reverting 1bc7e8a per Spuds request ... resubmit
Merge pull request #1604 from Aggelos777/master

Reverting 1bc7e8a per Spuds request ... resubmit