Revert "Revert "Early Layout Proto""

This reverts commit 71988d39fd2f0d932145e06f81a508065e855201.