Revert "Merge pull request #11 from KaushikRay/dev_6_child_1"

This reverts commit 4a0997e28a8c0423e90d9fc08ecfabd88ca6b893, reversing
changes made to e571280a6bdb4c4d280e91ab6f494ff6eaad844f.