fixes #1661
removed using directives added while testing individual objectbuilders
fix conflict
Merge branch 'thirkcircus-fix_issue1661' into develop