Make default layout plugin-compatible again