Now again, hopefully without merge conflict

This reverts commit 5273b6b2.

I doubt anyone would want to slowmo it. Additionaly, this way there is an easy reset to 1. Previously you had to guess where the 1 was.

This reverts commit 8e555b49.

This reverts commit 11d44aee.