Revert 0862f0a1eef. This was suppose to be a part of the pull request 247, however erroneously merged to master. Hence reverting.