Reverting any other changes

Changes should make this commit the same as WrinklyNinja's Commit 19
days ago, which is marked as 69893202b5dafe06411e19895fd87f92becbab1e

or just 6989320