b18e0d1433
* commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8': revert ADDR_COMPAT_LAYOUT workaround.
* commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8': revert ADDR_COMPAT_LAYOUT workaround.