added back in accidental deletions in code cleanup for commotion_helpers module