Revert Class rewrite and ficheinter line trigger
Merge pull request #964 from FHenry/3.4

Revert Class rewrite and ficheinter line trigger