Merge "revert ADDR_COMPAT_LAYOUT workaround."