RF: remove extra template layer for wrapping