Undo commenting out patch - it is needed.