Revert ZAVS drop and split scannedonly patch in two