Reverting some changes

There really is no reason to break these out since they don't have many
variances