roll back part of last CL
Merge pull request #132 from dart-gde/devoncarew_checked_fix_2

roll back part of last CL