Reverting patch for now: