Might be worth to keep these 2 removed lines with a `#` in front of them, so we can easily see what need to be put back when we remove the custom handling.