Re: [PATCH 0/3] Revert HAFDBS changes