Revert "Merge pull request #14 from KaushikRay/dev_7_child_1"

This reverts commit 25fe4823ffbb16461b65ac47f9bfeb80440aa0f5, reversing
changes made to e571280a6bdb4c4d280e91ab6f494ff6eaad844f.