Blocking patch that was already committed to trunk