Commit should have been made to parent branch

Revert "Minor updates to parent id handling, allows command line override and local parent"

This reverts commit 43a49dfd816a2bed256eed564159ea247024b4b2.