Remove defaults until a fix is ready