Hack, remove, add back.
Bring default layout up to par.
Bring in typeplate.