Updated for changes to layout_plugin in issue #2326589 (untested).