Reverted as the new set logic is adjusted to do this correctly