Commits 907383da and e43a737c were causing issues for people with STML0's and STML1's. This commit reverses the changes in these two commits.