IMHO the rest of the PR is ok but this change should be reverted, @Seldaek what do you think ?