Fix failing tests
Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.
Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.