Recombine after #1272