Revert to original code here because the `defer` strategy was causing problems in the stencil layout