Add back old layout, to make plugins backwards-compatible