[OE-2746] this shouldn't be commented out.