Patch does not work, revert the broken commit