Outcommented patch which conflicts.