There is no reason in having both and the latter is a separate derivation and thus easier to maintain. Closes #21976