Revert "Merge pull request #407 from tomdeboer/STML1_Fix"