Backend for #979