Removed patch now in stable/havana

Change-Id: If10bff13cc9016e4d01d89d81d4316fadb400f31