Fixed second `Handler` law
Revert "Fixed second `Handler` law"

This reverts commit 05e220114f858adb601f4894013fdbe04aba67ac.

It was right the first time.
More changes