Could we conditionalize this? Simply commenting this out would break a lot of existing code.