Removed the code from another pull-request