Early Layout Proto
Revert "Early Layout Proto"

This reverts commit becd949fc89bfea36c172c4cd8796273b3885dd9.