LPS-42582 Layout null check
Revert "LPS-42582 Layout null check"

This reverts commit ca782e2a8032b4afbffdb4cbf4a280aef82c97ed.
LPS-42582 Keep the prototype stuff together