Try again at privatizing the layout info map, with a rewritten patch.