Reverted Changes back to previous implementation

ticket #682

Removed comment