Reverting some of the code changes from the previous commit
Merge pull request #530 from rmansoor/master

 	Reverting some of the code changes from the previous commit