Fix degradations after #899