Add 'layout/shim' back in