Removed patch which no longer applies since underlying codebase changed