I'll keep it around for debugging but maybe it should be controlled via a flag instead.