Revert previous commit, reopening #370.
Revert previous commit, reopening #370.

This reverts commit c7f1aab25241789d7bd096171391877e60af55b3.

Anaphory/beast2,Anaphory/beast2,CompEvol/beast2,tgvaughan/beast2,CompEvol/beast2,tgvaughan/beast2,CompEvol/beast2,Anaphory/beast2,tgvaughan/beast2,Anaphory/beast2,CompEvol/beast2,tgvaughan/beast2