remove duplicate code, the patch was applied twice... sigh