Reverting previous commit, pending investigation
of sporadic seg faults from various build farm members.