Converted buildLayoutClip back to original.